merge trunk
authorK. Handa <handa@gnu.org>
Sat, 29 Jun 2013 03:44:38 +0000 (12:44 +0900)
committerK. Handa <handa@gnu.org>
Sat, 29 Jun 2013 03:44:38 +0000 (12:44 +0900)
commit53a4892a42c50b79846d3b1998ea054dc18957da
tree00c5b7dfa3bf6c3f767ec32196b0ac48e95207b2
parent3631425ee1fb31f5eb6e400701274e76595801f5
parent8ce30dca10e86234fcd20494c8ce89caa23f7d35
merge trunk